renamed src dir
refactor to external class