File structure redone