Initial commit of package detangle work