More refactoring (I just renamed a folder and now everything is untracked), as well as some beautiful network abstraction.