Fixed the finding of classes to also check name-spaces