Reorganize using RequireJS