Moving template to usr/. Also allowing JDK version to be determined based on presence of java7 marker.