fixed namespaces and changed env to be enum instead of actual url
changed folders
refactoring to code
added some new server api version2 features (not fully tested yet)