clean up code for readability
Merge pull request #8 from tiger-swallowtails-2013/clean-up-files-and-file-structure

clean up code for readability