[PIII-21]

[PIII-21] Removed unused folders