Minor reorganization

Changed the organization a little.