Clean up
Added missed directories