Added jre/jdk.
Cleaned up.