hotfix 2checkout

- withed NPE with post request in return
- commented unit tests need rewrite it
- changed directory arch