moved several more private classes to Elgg namespace