Composer added, includes directory renamed in prep for autoloading.