Renamed packages and prepared story