Update directory structure to fit spree-2-3
Fix directories structure