Reorganized files to gemify and make them fit the spec harness