master - Refractor to requireJS