Renamed files to be more OO