added Herbert's docs, updated dir names to new standard