Revert "restructuring"

This reverts commit f9cdcc764d44460d47e23a0d4c117b0c1625e538.
accidental recursive rm revert