Moved the "modules" into their own folder