renamed files and moved things around, fixed tests