finalized new file structure