Renamed major namespace. Added some more comments.