Edit structure and Makefile, fix compiler warnings.

Fix wrong order member initialisation list.