Folder Structure fix