Moved some modules to common library