Move settings directly into file and update relevant dependencies