16e9f12a34
Also rename tests and rename some constants, and modify Makefile to handle the new structure.
Also rename tests and rename some constants, and modify Makefile to handle the new structure.