Manual Sync Part 2

Forgot to clear out the now-unused folders.