Edited file structure
Revert "Edited file structure"

This reverts commit e605fe854bc2bfe606d3e52e5a1cac072738a2fc.