sorted folders and removed code