Moved java files back to main project