Fixed problems with the packaging order
Compile for Java 6.