Move fixtures into directories