Revert "moved classes into more packages"

This reverts commit fb80beb000a9323cb215f354ac98ab82f8e7ddb5.
Revert "Revert "moved classes into more packages""

This reverts commit e5434d17b74731d98db05bd370bb0496caa6c318.