Added additional refactored files