Migrate 1.x Files into the Master Branch