Reorganized Program.cs