Added Testing files

Reorganized code and added testing files