refactor structure of project