Add web api service
Restructure