Consolidated some source files.