Add namespace to some classes. Add comments.