File structure consolidated