Software adapted to the new folder structure