refactor a little; fix issue with importing servlet deps