Moved model classes

Moved model classes with potential problems out of the src directory
import scala.language.postfixOps

import scala.language.postfixOps as advised by compiler