Revert "Changed directory structure"

This reverts commit 8d2dcfc82806e97c5636d90962419c8f07e9f9ed.