Performance improvement

Reorganization & restructuring