Updated makefile to remove build directory, added missing OSInfo.class