Reorganized makefile, source directory/tree, and streamlined op api