I agree with @tbekolay w.r.t. location. We should group things according to what their purpose is and how it relates to other objects, not what their type is.