changed directory structure to work better with jenkins