Switch from dots to slashes
Misc cleanup
Upgrade underscore
More misc cleanup