Move solution to Ext. namespace