Moved folders around to mimic Debian paths.