Adding folders with name errors, includes, pkginfo and shell