Renamed Environment=Organic, Movable=Pushable

Did refactoring and resetting accordingly