Revert "Altered directory structure"

This reverts commit 381f8d94d3ca6a085bfec43ccc731b4112de4488.