readded Java classes in new structure