Boom great big update, moving things around, dependency changes