Refactored code, removed Elements and Helpers and integrated into Canvas and Caret