renamed files, about to start test revamping
moved all tests into one file, and made them haskell-ish