Change package name
Move validations to other files