reorganize structure of project