Split up some files and scratching around to make the queue work with akka-streams