Moving some things around in index.js