Project restructuring, polishes, refactoring.