clear up
project restructure
amend