Made the directory structure more generic.