Add todo for next version
Minor changes to app structure
#10 Implemented