Moved object files out of src tree.
Removed stale comments
Merge branch 'testing'