rearranged some files, added bookmarks