Reordered the file system and removed some old packages.