Revert "restructuring folders"

This reverts commit c8806ae93fef85bcd31e74ffbbc65f2cdf458d51.