support for all versions of java

Signed-off-by: Mattias Andrée <maandree@operamail.com>
move inte directories based on language

Signed-off-by: Mattias Andrée <maandree@operamail.com>