restructure project hierarchy