Clean up the paths a little bit.
Remove some dead code and slight folder renaming.