Another update
Reorganize dependencies