project restructure

update