file structure improvements