Move classes in namespace Common