Renamed input package. Slight editing to a few entities and items.