restructured handlers and tests to each have their own files