Moved classes to NGN root