Moved some classes to remove some cyclic package dependencies