Reorganize for testing