Bunch of work towards Dockerization