Moved main screen classes to their own package