Issue #43 - Consolidated files.