Remove unused files
Remove unused makefile
Rename psake files to keep them together