Change folder structure to provide a valid package.