Make what's been done so far factored and tidy

Start as you mean to go on, and all that.
Internalise remote HTTP dependencies

This looks pretty ugly on my laptop otherwise.