Fixed imports and switched classes to util classes

Going to be adding structs for the actually information