- Reorganize code