More reorganizing
fix cnflicts