Move non-model classes into lib/
Fix dependencies between modules
Remove ambiguity from column names
Reduce complexity for finding the last transitioned flag
Fix loading