Renamed packages, code cleanup
79 files changed