Moved Server to Console Application

minor layout fixes
Merge pull request #1 from Splamy/master

Moved Server to Console Application