temp remove dagge
rename and move everything for consistency