changed namespaces for all classes, updated includes