Names of packages and classes fixed, but it does nto work yet.