Moved a few more things and edited some comments remade war file and generated javadocs