Adjusted packages and Java version 2