Restructure and fix descriptor, mock services and docgen