Did some clean up, moved classes to better packages/submodules