redesign file structure