Added main menu screen
Package refactoring