Refactoring progress; Added new file
Refactoring progress