Reorganized just about everything