WIP: Cleaning files

Working on cleaning up the project based on issue #3.