Restructuring & WIP on vectorizer.