Tidy up of const Ear and moved other version to subdir