Refactoring: Move codes and delete files