Converting to src/report directory structure