Renamed some paths and a class for better understanding them: