Reorganized; added more objects in appropriate files; note that the last 3 additions are not origin centered yet, necessarily.