Moved classes into controller and view packages; fixed import references for ShapeDrawer