Third commit

Reorganized files