Cleaned up configure blocks and moved jdk to configure block