Generalization of Namespaces and Classes + Error Handling
Added missing files from previous check-in