Fix structure of directories