package reaccomodation, some cleanup, and changed test to use specs2 + junit instead of scalatest