removed .swp files and rearranged