Rework base paths
Rework base paths