Renamed packages and created few classes