Added structure to file-system