Some adjustments to project structure...