Cleanup naming & events based on feedback from @dget.
Move models and collections back into individual folders.