i01t08: Improve structure and Makefile, closes #12