Moved all top-level to model package
Syntactic sugar (in testing)