moved a few files
updated lfdictionary directory
round 2 of model folder merge from LF repo
fixed up broken tests and code resulting from ArrayOf and MapOf changes