Package structure refactoring.

Commit all removed files and packages.