Few changed

Moved methods because Program.cs was ugly