Structure change

Cleaning up code and app structure