Factorisation

DO NOT MERGE!! There is still some work to do, to get the paths to the specific parts of the projects working.