separate into folders, add vim