Folder Fix

Fixing folder structuring.