directory reorganization
fixed data dir path
update travis make calls for new dir structure