Refactored the file names and entry classes to use a better naming
system w.r.t. lexigraphical ordering.