Redone file structure