remove files that are in wrong places
move project to correct folder
move test project to correct folder
update .gitignore