Fix dist folder tree + add tests to avoid breaking that part.