Moved classes to outer assembly