Adjusted packages and Java version 3