Started migration to WS. Added basic test. Refactored requires & modules