Update dependancies
Remove duplicate code
Update package, licence and readme for specialised fork