Refactored features2d & xfeatures2d

now the features2d classes match OpenCV3 style