Adjusted Folder Structure