Cleaning up

Deleted files, moved the data to a separate folder, put in a (maybe
bad) naming convention