Added Server config files
Refactored