finally v3 of dorfiles

cleaned up enough for a 3.0