Cleaning house

Deleted some redundant files and changed names to be more logical