Reorganization following Mike's suggestions