Add new Makefile scheme and move source to src/
Modify target names in Makefile
Make user input a little more robust
Add signal handling