Modify project structure, separate WebApi from Client