Fix the build & improve directory structure ...