GCP-5784 Added javadoc and organized setup