Refactored directive
Added NotepadController