Reorganized files foк pytest