Returned to proper structure. Now clean up and test. Should've done that earlier, so focus on maintaining a good overview.
Checking in because test suite is starting to take up too much time on netbook (several seconds, blocks vim for a moment. Will continue on desktop.