Resolve "Controller/Makefile uses older versions than the one in the top level"
Description
This also includes changes to the Makefile structure for cleaning purposes. Calls on the functions should work like they used to.
Related to #308
Edited by Fabian Seidl