Moved some files to clean up