Move source to src dir and handle the 'empty label' case