Last bit of reorganizing for now