Some renaming and added java support file