Big refacto with Akka