Moved classes from Internals namespace to Internal