Refactoring Path

Starting a refactoring stuff.