Redone file structure.