Changed namespace and class locations