Restructured the project, cleaned up some code, made the things pretty.