Reorganize and comment dependencies