Cleanup

Mostly renaming files and cleaning up logs.