Moved modules into their own partials