Changed packages for use in MVC style
Merged with Steve's tests for package move