Moved files around and got rid of require.js