Move both plugins and themes back into correct folders