Starting some unit tests
Reorganization of logic
Externalized modules, classes, etc.
Refactoring