removed code repetitions from files and folder