Changes in app structure(finished) 11.12.13