Updated directory structure
Makefile edit
Simplified travis test script
Simplified travis test script
fixed conflicts