Clean up files and put them in src