Massive cleaning + Makefile