Move some files around
Remove Functor/Equality

Functor/Paths is no longer slow
Move more files around