Cleanup + add new SAE & downloader code
