Move jdk to its own class