Move file in better place, ref #29