moved to util directory
Fixed inheritance