Removed and added some dirs and files.