Revert "changed directory structure"

This reverts commit d9305b3f19df383b451390586b4e0c8a3af474cd.