Tests all pass with the new directoryt structure