some rework content folders resolving.