Updated makefile again to now compile the different sources correctly.