Moved files to better libraries
Updated to new Validatable interface