Remove deprecated tests
Clean up file structure