Change: keep dist directory in folder structure