Project structure updates fixes.