refactor app structure:TODO - fix route deps