Reorganized files
Added NFA generator interface