merge ws and web modules into one consolidated module