Moved files to appropriate location for build