refactor Makefile & update bashrc