redid structure, added requirejs