moved things around and reorganized