Reconfigured all of my require statements, much nicer now.