Added default config
Deleted old Makefile