Removed autogenerated directories.
Updated for new autogenerated directories.