Reorganizing into .NET project