changed app structure towards job type first