Added cursor tests + cursor ext methods

Also  project structure and Cursor menbers are refactored