New Makefile. Project reorganization (the last !).