Classes organisation and add of a Makefile