Split dependencies, update Dockerfiles