Moved classes to org.scalamock subpackages