Moved Server to Console Application

minor layout fixes