Moved some modules to pipeline