project structure improved, javadocs updated