moving things around to set an app structure, dependency bumps, r.js optimization