re-organized files so tests work

observe the new format for require please!