Consolidated files in their appropriate places