ready for testing makefile
Recatored the settings to Options struct