Reorganized files & few fixes