Cleaned up the folders and files