Refactor server into server and instance
Merge pull request #3 from iHiD/refactor_to_instance

Refactor server to server and instance.