dependency updates, code layout