File structure

Fixed file structure