Added makefiles, exceptions