folder structure change, script might need to be updated accordingly