Added testing tools
Reorganized files