Changed some things around with directories.