Changed package names to reflect the MVC style the program is currently using.  Removed unused imports.