moved things where they belong