Still not an alpha

So still a complete sync instead of commented ones. Anyway, I changed
(reduced) the namespace, and renamed the variables to better names, and
introduced a new helper class function or two.