more clean up and making things cleaner
Merge pull request #379 from jrossi/make-repo-clean-up

Remove unused files and moved files into correct location.