Move fixtures to base of app