Moved unused or already ported code into old package.
Some import cleanup.