Refactored features2d & xfeatures2d

refactored featured 2d features classes to match OpenCV3 style