Folder and code cleanup