Removed BasicExtractor and some internal classes/traits from public API