Remove and rename files

Cleaning up old code, renaming files and folders to a more standard
format.