Added the new refactored code files