added jtype
changed project structure