Makefile. Restructure. Cosmetics and code refactoring.