Config: refactored files