brutal and massive reorganisation of the code, didn't bother to git mv ;)
fixed dep name error