File structure

new file structure