Convert to V4
Kill unneeded directory
Cosmetic