Improve Modularisation of projects