a thorough cleanup and restructuring
fixing up the documentation
Merge pull request #1 from wkerzendorf/general/clean_up

General/clean up