Renamed packeges and added dependencies.