Added and renamed files for new deployment method.
fixed service dir
Merge branch 'deploy'