some reorganizations, renames, added test fit files.