refactoring packages and class names
refactoring packages and class names 2