Moving files
Updating for clean build.