Fix for Java 1.6
Move all into package
Remove excess