move files
cleanup
add tests
extractor tests complete + fixes