Moved classes into more appropriate subpackages