Remove 2 uneeded directory resources by making directories recursively

Also solves a corner case failure that could occur