Migrated project to VS solution