move common into a submodule