Updated New Java Files

Will now be switching to another branch to work on intergrating the new
structure into the program