final restructure - src path, makefiles, requirements inc dev