reorganise files; add a Makefile; change default width