rebuild with maven
refacted with maven