made folder structure sensible -- moved all test code into testing