[Upg] Cleanup
[Upg] Use Suricate instead of Fwk dir scheme
[Upg] Adopt Suricate scheme