Refactoring (Modulization. Seperate Class, Repackaing)