Fix structures dir structure