refactoring EXTRACT CLASS added
19 files changed