adapted to new folder structure