PRIS-58
- Normalized package structure
- Removed unused and not working VMware implementation