clear unnecessary code
restructure directory