Started writing the Convolver class and refactoring code