removed fabric, replaced calls, updated some paths