Restructuration of code.
Fixed some calls in webapp for the new API structure.
More fixes with new API.