Renamed main file, adjusted Makefile to match