Changes in app structure(unfinished) 10.12.13