Rework base project