changed namespaces and folder structures