Refactor to move args code into separate file
Reorganize directory and refactor Makefile