reorganized files
its working finally