Revert "better organization"

This reverts commit c55cbb27adb3a4210cdee27a85c334fa475ce2d8.