Cleanup

Removal of extra files and move to new file naming convention.