Revert "ws"

This reverts commit 6274e57d536f1aff8d636318a437a39fe3204078.
file structure clean up