Remove unnecessary boostrap class
Moving client configuration file to the server
Inclusion of configuration file for the server bits after Bootstrap class exclusion
Merge branch 'bootstrap-updates'