new tweaks for new directory structure