Summary: removed offending EXCEPTION_MARK calls and code cleanup
Reviewed-by: dholmes, iklam, coleenp, mseledtsov

Summary: Moved makefiles out of build and build/closed into make/
Reviewed-by: kvn, ohair