Creating initial framework for refactoring core codebase