IMPROVE: Refactor package for avoid server client dependency
IMPROVE: Remove client classes from final war