Reorganized files
More "get" for more explicit results
Added "has" to the benchmark