Added various new directories and such