Deps updates + organization fixed