Commenting for javadocs and some path changes