naming
changed /home/docker to /opt
refactor and adding pretests
merge with pull request