Change package paths
Improve memory, progress on refactoring more, still more to do