Revert "Change directories structure"

This reverts commit bab32d89b848860394497acfc6fe7ea5f19aedec.