refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR