Reindenting time!

Also moved all of the types to the octc namespace