Version control client updates
package refactor
User domain/data, servlet layer