Basic app structure
Little cleanup