more changes to the Sailing domain and better organization of the Makefile