changed app structure
mostly working