Updated jdk package structure