Added import javax.annotation and re-factored packages