Removed accidental externs
Restructured to accomodate a slightly less terrible Makefile, updated executable names as necessary