Enable debug
Reorganization