cleaning up namespaces and removing unused code
more refactoring and renaming
renaming the association tests
heavy refactoring and splitting Model into separate modules