Moved traits to main scala files