Move Controller and subclasses to sim/controller

And deal with repackaging
Remove debug statement, give screen starting focus