rearranged files
made some changes