a couple of dir classes drafted
a info.yaml file class drafted
resolved conflict in fsmapping