Moving files around for future AMD approach, based on AMD suggestion