Merge pull request #118 from rhyolight/cleanup

Lots of cleanup.
Renaming files.
Restricting logs during tests.
Code cleanup, indentation, etc.