Fixed Folder Issues from Revert

Reverted