Fixes #3 - moved in report folder and added javadoc