Moved and renamed classes
Added validate methods
Version 1.2