Updated to 2.0.0 and took advantage of directories.