Renamed some files and classes for more clarity.