first working draft
modified intermediate directory
removed common files from server