Code cleanup: move a few packages and remove unused classes. Pure refactoring.