Moved files to proper namespaces. Started export to MVVM