Move files, fix build