Folder Structure Fixes