Move JDK7 to top-level folder