Project organization / cleanup.