Refactoring, organizing

Refactoring, organizing