People and env added, rearanged some classes