Added fences - cleaned up object list

Added Fences, cleaned up test objects and bundled up other objects into
heirarchy