Move files to correct locations and rename where appropriate
Remove redundant files
Merge pull request #1 from sutton-m/master