Refactoring - New file architecture