Changing the structure of the project and adds support for WSS