More project restructuring, no code change