consolidated and deleted unnecessary source files