Revert "File structure"

This reverts commit d77aa6c3263ba2f842cc7a3e22d9e610bdbd3556.