Updated and rearranged dependencies