Mostly done with awesome restructuring: namespaces and themes.