Some cleanup of root directory as part of reorganization