removed inheritance
changed links to this repo