Fixed input args check bug. Modified makefile to use new structure.