Lots of cleanup and saner pathing and resolving to make way for the dist generation.