Added the actual refactored files.