Moved some classes to common