Modules moved to separate files. Fixed a bug with the Validator that
caused it to return invalid identifiers
Bump version