More Refactoring

Moved some packages in core