restructure folder, remove redundant files