Moved Cursor into its own package