Reorganization & fixes