moving several items into their own files, working towards ff compatibliity