Added portrait mode
Moved classes into logical hierarchy