restructure project's structure