Revert "Change the directory structure"

This reverts commit bf5552d8a32bffee5a0f5800d25abf48b29ce14b.