removed empty folders
Fixed missing references to persistent objects