move to packages. add javadocs
some hint