Fix issues with paths & module names