rework file structure
rework file structure