Updated comments/organization/naming
Reverted to original framework makefile