Corrected package statements in classes