Reorganized files
Expanded tests