Gwommy/kwds — pull request #2 by mcordingley (2012-07-21 22:34:00+00:00)
Title: Partial cleanup to code layout

Check out the individual commit messages for details, but the main point of this pull request is to organize and structure both the files and the code. It is by no means complete, but this should be a good increment.