Dapi/feature/organization in faye