First phase of code cleanup
[griffin] Cleaned up/redid app structure
[griffin] Fixed window stacking after open multiple & close