Feature/pick module

as long as we won't change them in dockerfile, they won't