Nuked everything, recreated some stuff, added other stuff.

Read README for details.