Adding refactored files