Revert "New file structure"

This reverts commit 1b9a17e38fd6f7c94ff22e5365bf6a66372d5cc3.