Git cleanup

phpws didnt get recognized as submodule.
More cleanups to follow.