Moved classes into new subtledata directory