Move all optional modules in