Added paths and renamed some structs