Better cursor proxy

Don't want to remove all cursor features. Needs testing.
Removed some stale code
Fixed a terrible bug

Children objects were accidentally removed from the adjusted collection.
Files renaming