RE-organize folders and discard unused components