Move fixtures to prevent conflicts
Rename fixture app folder