clean and restructure project