moved all fixtures to their own files, rejiggered namespace