move all into the same package and name XFeature