Changed package and added code to .java files