hot fix for change folder layout