Revert "put all in a folder"

This reverts commit beb5b195851af1907cf21599f1a0ba41c9e09f18.