adjustments to spa dir structure