Source tree refactoring, little main.cpp cleanup.