Reorganise directory structure
Add Window menu