A semi-working phase
Reordering and simplifying project structure