Updated version
Reorganized files