Renamed some packeges to apply bether naming convention.