Refactor into individual fies
aggregate fields post validation
remove packages dir, not sure why there in first place
bump version