additional deps
rework directory structure
changed paths according new dir tree