Moved common modules to lib