Updated tests, reorganized files