Fixed some legacy class name references
Some refactoring of associations and model instantiation