Re organizing
Changes im makefile to use EICU