moved the modules around a bit and created better names