Moved classes to separate folder in /Rules