Minor code cleanup
Renamed packages to fit naming convention.