Project Clean Up

Moved files to more logical locations