Removing unused folders and files for clarity