Renamed scripts. Improved Makefile