Consolidated classes and files